Fixes pattern match to intercept normal flow.
Merge pull request #700 from typesafehub/wip/h3nk3-pattern-match-fix

Fixes pattern match to intercept normal flow.