Links generation fix