name-related bug fix