#AA-6 fixed