Workaround for aftercaptureform check issue