Convert #623677 to Flügger