Fix for delayed capture stop