some classes fixing