Possible fix for PyPy