Fix capture proxying

This should fix #453.

I based this on #454. Will rebase that commit away when everything else is fine for you.