Fixup for singletons