Fixing store generation.