Fixed issue #2174