fix some stability issues (I don't know why but it fixes the problem
like a charm)