Fixing parse issue