Fix Color Bug