Another fix to the previous commits.