Fixing issues with capture_helper.