RPBI: address GaelVaroquaux's comments.