Fix the taxonomy issue