Fixed issue #5427