Nice to have: remove magic numbers here and the next line (frustratingly hidden by github's diff viewer).