Fix override check/define