Yet Another bug fix (Dang, was I asleep when I did these?\!)