AAD-51: missing attributes, removed bad check