Merge "Fix problem where wrong colors would be picked"