fixing the Singleton.