Fix output of handlers