fix ordering. Closes #2