Fixes CC toggle problem via Master 1-2

Ok, so I lifted Scott's fix... But I'm learning... :)