Fixing syntax error introduced in last refactoring