The Boeing Starliner spacecraft is now scheduled to undock from the International Space Station and return to Earth on June 22 with its inaugural astronaut crew, NASA said on Friday, giving more time to finalize planning for the complicated process.

NASA astronauts Butch Wilmore and Suni Williams were launched aboard Starliner June 5 and arrived at the ISS the next day, following a 24-hour flight in which the spacecraft encountered four helium leaks and five failures of its 28 maneuvering thrusters.