Fixing DI EnhancedProxy issue