Earlier this week, director James Gunn wrapped production on Guardians of the Galaxy Vol. 2 with a rousing speech from Chris Pratt. And while we may need to wait almost a year to see the sequel, Gunn is already looking ahead to ensure that a problem that plagued fans of the first film won’t be repeated.

When asked by a fan about whether the female characters of Guardians of the Galaxy Vol. 2 would get their own action figures, Gunn responded on twitter:

I’ve been on this 100% from the beginning of Vol 2 making sure our primary female characters are represented in toys https://t.co/B5CYlNNDpz

— James Gunn (@JamesGunn) June 17, 2016

Gunn later reiterated the point on Facebook by saying he wanted to make sure Gamora, Nebula, Mantis, and the new character portrayed by Elizabeth Debicki would be “more represented in the toy world.” Gamora actually did get her own figures in Hasbro’s initial Guardians of the Galaxy toy line, but she was left out of several items of the film’s official merchandise including T-shirts and backpacks, inspiring the #WheresGamora hashtag.

The latest comments from Gunn didn’t directly address the sequel’s merchandise outside of the toy line, but we’re hoping to see a fix there as well. But at the very least, we’re gonna get four new female action figures out of the film! Mantis is the newest member of the Guardians, as played by  Pom Klementieff. Debicki’s character has been a closely guarded secret, but the most popular rumor is that she’s Her, a character who has also been called Kismet and Paragon. In Marvel’s comic book universe, Her is the female counterpart of Adam Warlock, another Marvel cosmic character who is widely rumored to be in the cinematic sequel.

Are you happy that Gunn is taking a more active hand with the Guardians of the Galaxy Vol. 2 toys? Unleash the power cosmic in the comment section below!

Image: Marvel Studios