Fixing parser step by step