Fixed Class Conflict