Moved observer toggling out of loop, fixes #6