### Description

avoid keeping the borrow too long

### Testing Instructions

<!--
  Give a quick description of steps to test your changes.
-->