Possible restart fix