Keep #5102 fixed