Another important bug fix to previous commits.