Hotfix & Switch to next task