Fixing the links