Convert #623794 to Flügger