Tweak helper blueprint

Fixes #2228