Fixed the helpers.