#5987 sumufix