Fixed output data bugs