fixed store/move issue