Bug/fix store iteration