Timestamps fix: transaction is optional