Tinder, ubiquitous as it is, is now running into some of the same problems as other online networks that have grown to huge scale in a relatively short time: it’s gender options don’t account for many of its users.

Speaking at Recode’s Code Conference, the company’s founder and CEO Sean Rad said that within the next two months, the app will get new options to allow for people who don’t identify as just male or female.

“It’s not only good for the Tinder community, but it’s the right thing to do for the world,” Tinder told Recode.

The app uses Facebook to manage connections (who are we kidding, hookups) between users, so it makes sense for it to follow suit in adding gender options.