Fix Singleton