Fixing syntax errors from previous pull request