FIX: hidden helper class is important
Merge pull request #2573 from fantasticfears/patch-5

FIX: hidden helper class is important