V3.0.6 overide to override