fixing after code review