Bug fix on CaptureManager