Record stubs fix bugs

* [x] Fixes #422
* [x] Option to disable feature
* [ ] Documentation