hotfix for missing attribute, and buggy hostname matcher