Borrow flag fix