Resolve timing issue with restart