Links bug fix