Attempt to support PEP 3149...try #2