Fix to allow empty attributes