Convert #623226 to Flügger