Fixed bug with datum deconstruction