bugfixes in capturing