Fix Ack mapping