Fix trubble with singleton classes.