Backport #54 fix for 2.4.4