Fixed issue #2149