Minor change in output handling