Fixing non-verbose mode