#9 Fix OutputExecutor