Fixing parser