fixed parsing (again)