Fix all comment 26/02/2014