Fix parsing (sort of)