Wasn't the point of the helper to get rid of this?