changed flow to always invoke

new PR, instead of #46