Fixed issue #2044