Code cleaned from last fix.