Color change bug fix