Fix auto-unlinking