fix of the fix for bz 875867