Fixing Attr extraction