Don't enforce singleton behaviour

This stops the map from working sometimes.