Fixed a problem with registering/unregistering built in stores