fix issue #1330