Actually use random
Merge https://github.com/greglo/oxhack