Fix Beat Up crash