fix: added conditions to check for attributes