Fix recursive move