figth against leakage
some tuning