fixed issues with transaction stability