mostly fixes 136 - race conditions are possible