Fixed issue #1523