Fixed issue #2419