Fixed OutputHandler