fix for #6691,#6692: overriding fixes for #5669,#5668,#5727