Fix Confirm and Finish process