Potential fix for #1216 and duplicate extended attributes issues