fix bugs in Capture