Nit: maybe use new `on.` api method?