Another bug fix for #2.