Fix duplicate responses