Borrow button fix