Fixed issue with the service call being issued before the files were in place -- issue-1