Fix for WebApps