final fixed to make the reconstruction work