helpers fixed