MAP-900: small fix for gender cases.