Fix duplicate Classes