fix & test for pull 2299 regression