Adding better ACK support in hopes of fixing a bug