Fixed issue #2816