Convert #623297 to Flügger