Update from Singleton fix