Fix parser

@theneikos please review.