Fix to logic determining if context.matched in response (#646)

Fix to logic determining if context.matched in response (#646) #1593