fixed colours being switched