potential bugfix for JB#20854