Fix issue where ordering isn't forced properly.

Fixes #1181