FIX: Bug between EditSample and Withdraw sample