Fix for restart issues