Fix of broken endwith.