Fix broken guarantee
Merge branch 'daniel_2244' into daniel_buf_ref_datum