Applying the link_resolver instantiation fix