Fixed issue #2167