Fixed issue #2066