Fix move and copy files problem