Very good point. I am inclined to fix this in another branch. The parsing code can already use some improvements, and I'll add this to the to do list.