small bugfix in guards