attempt again to fix dupe classes