Even better way of fixing PyHawk.