fixed error while cleaning up store