Bugfix

Ordering bugfix