added a fix for guardian present, which was reported by CM