Attempt to fix restarting