logic ordering
Merge pull request #357 from Pomax/slowparsefix

logic ordering