issue #7704 fixed,This is my first commit final 3