Fix capture checks