Tweak order

Fixes #227