fixed issue #1368