Try to fix the helpers