Fix for duplicate record replies