Trying to fix an problem with links getting mangled