bug fix. Protocol version 21