Another fix for the UI race condition at start