more support for the singleton case