Bug fix - HostingController