Another fix for parsing