TDD might just work... fixed parsing bug