Convert #623429 to Flügger