quite probably a fix to the mutex galore problem found by Maciek  (not tested too much... sorry)