Bugfix - orchestration sort