Fix borrow-rank