Bug fix on Gender