Fixed override conflict