Fix class table