Fix scheme selection