Fix for chage to classmethod