Updated helper to address jammit issue