Fixed issue #2219