To r613 : resolved mutator issues