Fix after code review