Fix to prior fix