Weeks after the dramatic and controversial season finale of Castle, there is a shakeup going on behind-the-scenes.

Nathan Fillion Teases Spin-Off Show After Season 6 Finale?

Castle creator Andrew W. Marlowe is stepping down from his post as show runner ahead of Season 7, according to a new report by TVGuide.com. In his place, executive producer David Amann will be promoted to showrunner.

"Over the past four seasons, David has proven himself to be a tremendous leader and a great steward of our show's unique voice," Marlowe said in a statement. "I'm excited to continue our creative collaboration as he assumes his new responsibilities."

Senator Bracken Involved In Car Crash Finale Cliffhanger?

However, Marlowe is not leaving the series altogether. He will reportedly still be there "day-to-day" while he develops new projects for ABC Studios.

Marlowe previously defended the Season 6 finale of Castle, which featured Rick Castle (Nathan Fillion) getting into a car crash on the day he was supposed to wed Kate Beckett (Stana Katic). The final scene featured Beckett running out into the street in her wedding dress and reacting to the horrific incident.

Many Castle fans, who have been waiting for the wedding of Castle and Beckett, were angered by the incident. However, Marlowe insisted that there was a plan in place going forward.

"We felt like it was an interesting way to end it, in a way that people will want to know what happened, what's going on. We know that it's a bit of an emotional blow to the audience but oftentimes good storytelling is," he told TVLine after the finale. "With the mythology that we're introducing, we want to start it off with a bang. We're just sorry that the audience has to wait until September to see how we're going to resolve it."

Castle Season 7 premieres this fall on ABC, though the network has not yet announced a specific air date. It will be returning to its regular Mondays at 10 p.m. timeslot.