Fixed issue #2316