Fix to ACK

TODO: Need to check delete routines as well