NH3571 - Unit test and fix

It's not a common scenario, but I needed it the other day, and it didn't work...