Convert #623079 to Flügger