Singleton init fix