Fixing class method