Made colorp condition less weird.