move handle fix