Fixed handling transactions