Fixed issue #1991