patch needed for latest 21.2 CVS