Color bug fixed