Order selection fix