fixed with amir's bat