Bugfix for parse