Fix escaping in capture, part 2