Highlander fix

Fixes #5525

Q: should the datums be garbage collected by hand or is this ok?