[singleton] apply a simple fix for the multi-threading issue

for details see FS#1398