Fixed issue #2406