- Fixed (again) few bugs concerning the new parser