Fixed issue #2308