Corrected verbose mode to work correctly