Jacalvo/fix in place union