FIX: comments from @ogrisel