Fix to load the right Class