Bug-fix:

 - Output only when necessary