Data links fix