#AA-12 fixed