Fix controlling process handover bug