INDEEED That was my next suggestion... i think it might solve some part of the problem.

Some on-board stuff are sometime painful... it's worst every year...