fix for parsing