Fix non-block link-to with context