Fix bug in handover=false