tried to avoid some more race conditions in jingle