Fixed issue #2092