Fix multiple record warning