Temporary fix for Singleton