this seems to improve the non-rebooting situation