#AA-34 fixed
0 replaced with 1