fix issue #1110