fixing Singleton impl