fix transaction management for 1.6