Fix APD-494 part 2