Fixed up silly redundant parsing logic