Singleton resolution fix