Fixed singleton classes