Fix tuple recon/decon bug