Fix based on code review