Improve check output behavior