Workaround for auto commit threading issues