Fixed version of parser