fix override issues