Fixing singleton classes