Fix ordering

Fixes #66