new fixes towards 4.5.8