Confirm fix #2340 and #2322.