correction after code review