Fix combat