Fixed issue #1933