Hopefully fix restarting once and for all