Fixed issue #8525