Fix to pass test battery.