actually fixed guards