Fixed singletons.