Fix A6 and P1X3 code