[t906746] corrections from mjschranz