Fixed Duplicated class