Fixing bugs related to NACKs implementation