Fixing singleton scopes