Issue #10: 2.4.x portability ...