Bypass the all class method as it's causing some issues