Improve response collection detection