diff --git a/lib/langs/sql-beautify.coffee b/lib/langs/sql-beautify.coffee
index 88abaa9..e6c3018 100644
--- a/lib/langs/sql-beautify.coffee
+++ b/lib/langs/sql-beautify.coffee
@@ -3,10 +3,15 @@ Requires https://github.com/andialbrecht/sqlparse
 ###
 getCmd = (inputPath, outputPath, options) ->
   path = options.sqlformat_path
-  optionsStr = " --indent_width={0} --keywords={1} --identifiers={2} --reindent"
-  optionsStr = optionsStr.replace("{0}", options.indent_size)
-		                     .replace("{1}", options.keywords)
-      					         .replace("{2}", options.identifiers)
+
+  optionsStr = "--reindent"
+  if options.indent_size?
+    optionsStr += " --indent_width=#{options.indent_size}"
+  if options.keywords?
+    optionsStr += " --keywords=#{options.keywords}"
+  if options.identifiers
+    optionsStr += " --identifiers=#{options.identifiers}"
+
   if path
     # Use absolute path
     "python \"" + path + "\" \"" + inputPath + "\" " + optionsStr