singleton fixes