Another scheme selection fix