Fix issue where empty space not able to parse