Change in elael's code.