plan: avoid infinite loop in move_river