Convert #623525 to Flügger