Fixing bugs in parse