Field order could be lost

If "only" or "exclude" was used, the field order could be lost.
Merge pull request #64 from lucasnemeth/wtf-order-fix

Field order could be lost