Fix bug in Parser