Fixes #5839 

Fixes #5839 by making the comb slightly more gender aware.