Fixed duplicate class