Fixed problem with parsing