Convert #679238 to Flügger