Fix problem with move assurance