hw12:fixing name