Latest HelpersLib compatibility fix