Fixed issue #2369