Fixing restart issue