Fix ordering
Merge pull request #67 from latentflip/fix-ordering

Fix ordering