Fix to store singleton objects