CPython: partial fix for #67