improvements on implicit flow handling