Minor change of the objective handling.