New try at fixing bug introduced previously.