Changes Behavior of Endless Mode - 4.3.6.1

This is experimental, still not the wanted behavior.