Issue 337 - Race condition preventing initialization on first run