Fix to make_color with a base_color