Fixed issue #1514