Bug fix: overlapping response handlers