Close the loop on active issues

Close the loop on active issues