Fix color selection