use helper again (PR #153)

ref #106 #119

GitHub

Thanks :fish: