Fixed bug in Parser