Fixed override problem