Will update these as I go along after we confirm the fix is good in our internal projects.
- [X ] a bugfix - [ ] a new feature
- Changes are covered by unit tests
- Code style is respected
- Commit message explains why the change is made (see https://github.com/erlang/otp/wiki/Writing-good-commit-messages)
- CHANGELOG.md contains a short summary of the change
- Documentation is updated as necessary