Random reboot fix part 2