Fixed issue with bad parsing