Convert #721597 to Flügger