adding fix for parsing