There is a way to eliminate the yellow stain in all cases, I think.

PE