fixed issue #1563