Proper fix for parsing issue.