Also resolve another confusing issue.