(yet another regularly scheduled bug fix)