Fixed a bug with link hints + made a compromise with issue #60