Bugfix in capturing