fix clobbered changes