Really fix the parsing this time