fixed per code review