If we decide to not use modulo above, also change it here.