PRD-4747 - Simplication code was buggy as static inherited INSTANCE refe...

...rence was pointing to the wrong class.