#AA-19 fixed
6 replaced with 2