(GH #6) Limited the number of events in response