Fixed issue #1494