Backport #5 to 2.3.5