r22313: as discussed with simo: