Small improvement for color changes