Updated fix after code review