BHV-705: checking for disabled attribute instead of specific kind