fix: better helper template