fix guards