Finish issue-6-1 double check