Endless loop after update to 6.0.1