Store initialization fixed