Fixing bugs with --format