Convert #623292 to Flügger