CustomLink Fix