fixing singleton usages