Add fix for parsing bug