BugFix++
Potentially fix reboot issue again