Fixed issue #2052