Fix general class