Fixed issue #2100