Fix Capture implementation to reflect expected two step flow