[#009] This should a bit improve the situation before the proper solution is implemented. But at the cost of additional processor time (not too much though).