Fixed bug in basic parser