Fixed issue #1509