Fix/tern

Should fix the tern issue we found in last release

- [ ] Ready to merge