apply earlier fixes to second control flow
Merge pull request #3 from ties/fix/second_call_flow

apply earlier fixes to second control flow