Restart scheduler gracefully, close #2