one more singleton tweak