Another bug fix *sigh*