Fix for repeated records