Fixed issue #2415