Fixed bug in parsing