Correcting Singleton implementation