Fixed bug with parsing