Adding workaround for transaction timing