Shouldn't this be done in the memstore?