Related to the previous commit:

Use bit operator '&' instead of modulo operator '%'.