Bugfix: ordering logic