Fix for the restart (Maybe)