Some output fix