Finally fixed Singleton