Fix for onSelect toggle when setting color