fix issue #1034