Fixed Duplication

Duplication between sub class and super calss