Fixed issue #1501