Singleton
singleton fix