bugfix people list
Merge branch 'bugfix_people_list'