fix for attributes name and value