David fixes the errors in roles