[FIX] more generic check on attribute needed;