Rahul - Added a blocking await. Also fixed a subtle issue with future macro.