Fixed issue #1451