Fixing singleton from carrying to sub classes.