Issue #2: and more 2.x portability