Fixed teething problems with captures and corresponding e2e test.