fixed after code review