Fixed rudimentary parsing