#84 completly solved now !