fixed #8312