Fixes #8009 - Make sure the final version of helpers is in the controller