Fix issue with duplicate responses