fix the class duplication