Output bug fix