Fix confirmation checking procedure