Fix for online restarts