Fix client requested ack issue

Not well tested, but safe looking code!