And actually fix the parsing