Bugfix: ToggleService would get stuck

Bugfix: Loader