fix bug realted issue 962