fix issue #1815