Adding IoC fix to support webApps