Fix issue in HOLYGUARD