Convert #623027 to Flügger