Fix issue with Guard policies