fixed transactions handling