Fix combat wrapper spam