Seems to only be a problem with singletons