Fixed issue #2068