Fix ordering

Closes #87