Some nestad transaction fix