Helpers fixed