Convert #341663 to Flügger