Attempt to fix pypy issue