Hotfix for one call of singleton