Fixed parsing bug introduced in refactor