fix issue 1022

fix issue #1022