After hosting one of the craziest Oscar ceremonies of all time, Jimmy Kimmel is coming back to the Dolby Theatre for more.

Academy president Cheryl Boone Isaacs has announced that the late-night comedian is returning to host the 90th Academy Awards. Producers Michael De Luca and Jennifer Todd will also return.

“Hosting the Oscars was a highlight of my career and I am grateful to Cheryl, [Academy CEO Dawn Hudson], and the Academy for asking me to return to work with two of my favorite people, Mike De Luca and Jennifer Todd,” Kimmel said in a statement. “If you think we screwed up the ending this year, wait until you see what we have planned for the 90th anniversary show!”

Last year marked Kimmel’s first time hosting the Oscars, and although his hosting stint was filled with plenty of well-received gags and Matt Damon burns, the show was overshadowed by the best picture envelope mix-up, where La La Land was mistakenly named the winner instead of Moonlight.

“It’s not often you get two chances to have a once-in-a-lifetime experience and even more rare to be handed the keys to a party 90 years in the making,” De Luca and Todd said. “We always thought the idea that anything can happen on the Oscars was a cliché until we lived it.”