Back to the previous version because of a Seg Fault on other computers !