Unknown class key fix