Fixing peg parsing