Adjust guard to tolerate bucket types