fixes #528 Co-authored-by: Hugh Lunt <[email protected]> Co-authored-by: Hugh Lunt <[email protected]>