Fix helper extraction