Entry link bug fix