fixed parts of srv event and wait for all