corrects the way cups are handled