Fix schedule recalculation