Fixed a syntax error from merging