Convert #623616 to Flügger