fix issue #1930