fix issue #417

fix issue #417