Fixed a bug with the ordering.