Fix issue with parsing dirty