Fix Quality flaw : remove case not handled