Another bug fix...