#AA-38 fixed
9 replaced with 0