Fix for keys exchange: in progress