Fix bug in previous commits.