Fix problem with parsing