Unlink loop fix