fix "store is null"
rewrites?