Fixing class issue