Fixing lost Classes