Convert #623894 to Flügger