Random reboot fix part 1