Update for the capture bugs