fixed #5731