Fixed issue #1449