bugfix. NullStore was not public