Bug fix in parse