Fix: Color no more lost