John: commiting parse bug fix