Fix the outputs