Only wait when really necessary