updated to take into account asynchronous service start
updated  to take into account asynchronous service