Fixed output final problems