fix move & get