fix to use brand new one
enable unlinking