missing commit from the nack PR (thanks @jerith)