Another bug fix. I hope...