Fix for verbose support