Fix color switching back to original