Get around some timing/async issues.