fixing singleton