Added await condition on startup