Fixed issue #2080