Fixed issue with Singletons