helper generation is fixed now