Fix to parser