Fix color saving #2