fixes in Singleton