Fixed override check