Fix race condition between cleanup and Start

There was problem when Start might be before cleanup
ping @crosbymichael