Jacalvo/fix transactions