SSM Capture - 500 issue fixed