ensure wrappers are in place before creating links for them, fix #2440