Fixed issue with EXTENDED_ATTRIBUTES_2_0