link bug fix beginning