Fixed up parser