Fix genders of different forms

Should fix issue #57