Fixing class comparision