Fix old class