Fixed custom attributes