class key fix