NH 3694

I agree, but all unit tests passes with it. 
Nevertheless my fix should be treated as a temporary workaround.