Possible fix for Picard duplicate problems