Trying to fix .ighting bug