Fixing parse bug