issue with link interpolation fixed