Backport #511 fix for 2.4.3