Bug fixe
There is still a bug that happens some times and make memory explode.