Prevent duplicate detection - TEMPORARY FIX