Convert #623491 to Flügger