fixed handling of volunteer