Fix move problem