[FIX] Split of return move should keep the returned move [IMP] Better comment and check for state not cancelled