Fix an issue with overlapping classes.