FIX: File reference conflict