Fixed issue #2103