Fixed gender issues