Bugfix Transactionaware / more output