this appears to fully resolve the issue I reported in #2335