Mistakes in Caipei`s commit fixed