fix ordering. passes all tests for me. closes #100