Adjusting fix after code review