Correct any disfluencies in this sentence.
A longer working life would alleviate the manpower shortage in the next decade, when a majority of these baby boomers are set to retire.
A longer working life would alleviate the manpower shortage in the next decade when a majority of the baby boomers are set to retire.