fix problem with the singleton