Is there a test covering this case (sorry, didn't scroll through the whole PR to check)?