Convert #324569 to Flügger