modified Link API fixes #67