#AA-10 fixed