SyntaxError bug fixed (still ugly)