Fixed bubbleshield + color block weirdness