Corrects a problem of duplication of classes