Another fix of parser