fixed issue #1568