Update to self::