MDL-37572 small bug fix with misplaced assignment