Fixed issue #1923