changes after code review
bug fix