Convert #721338 to Flügger