Re-fixed color bug