Fixed another issue with the taxonomy change