Revert "Solved problem with repeated classes"

This reverts commit ca1b64c58080f2f234b84508224102010d422206.