Fix broken guards