Update to the neighbor/fence issue