Fixed parser problems