Fix to new plan