Fix the "Duplicated class definition"