ICC : Rotface, correction/improvement of previous commits