Convert #623684 to Flügger