Change override constucturs to filter out wrappers
Merge pull request #378 from arv/change-global-constructor-setup

Change override constucturs to filter out wrappers