Last fix for clobbered changes