Small fix to get over load errors and to get this working on 4.0.3 [rhoeflin]