Handles restart better