Added work-around fix for new await indicator functionality;ready to merge and submit pull request