Agreed. There are only two sexes...not two genders.
Stop using the word gender at all.
Unless you're teaching French grammar.