fixed #8254