Fix dump for CLI