more fixes to the new reconstructor