Convert #623129 to Flügger