Color bug fix