Fixed issue #5730