Should have fixed simultaneous color switch and z change problem