Added defence against startup race condition