Fixing parsing bug