Fixed issue #1982